build: Don't hardcode shared_library() in meson.
authorNiklas Hambüchen <mail@nh2.me>
Mon, 11 Nov 2019 15:37:46 +0000 (16:37 +0100)
committerNiklas Hambüchen <mail@nh2.me>
Mon, 11 Nov 2019 15:37:46 +0000 (16:37 +0100)
Instead, use the standard library().
This is a meson best practice.

Fixes -Ddefault_library=static not having any effect.

gtk/meson.build
testsuite/reftests/meson.build

index 65576f92c69f3d2caab2470fb5e27dec56f94781..4cdad1feb5d35e69cb1214a477ea51282f241627 100644 (file)
@@ -1007,15 +1007,15 @@ if cc.has_header('langinfo.h')
 endif
 
 # Library
-libgtk = shared_library('gtk-4',
-                        soversion: gtk_soversion,
-                        sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
-                        c_args: gtk_cargs + common_cflags,
-                        include_directories: [confinc, gdkinc, gskinc, gtkinc],
-                        dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
-                        link_with: [libgtk_css, libgdk, libgsk, ],
-                        link_args: common_ldflags,
-                        install: true)
+libgtk = library('gtk-4',
+                 soversion: gtk_soversion,
+                 sources: [typefuncs, gtk_sources, gtkmarshal_h, gtkprivatetypebuiltins_h],
+                 c_args: gtk_cargs + common_cflags,
+                 include_directories: [confinc, gdkinc, gskinc, gtkinc],
+                 dependencies: gtk_deps + [libgtk_css_dep, libgdk_dep, libgsk_dep],
+                 link_with: [libgtk_css, libgdk, libgsk, ],
+                 link_args: common_ldflags,
+                 install: true)
 
 gtk_dep_sources = [gtkversion, gtktypebuiltins_h]
 # Introspection
index 632e97ffeb4deb9c3dc0d18adef39aaa7e3b89c1..cf6042ab1ad611ee92a5bc7db637459f71796a3b 100644 (file)
@@ -1,9 +1,9 @@
 # FIXME: $(no_undefined) ?
-libgtkreftestprivate = shared_library('gtkreftestprivate',
+libgtkreftestprivate = library('gtkreftestprivate',
   'reftest-compare.c', 'reftest-module.c', 'reftest-snapshot.c',
   dependencies : libgtk_dep)
 
-libreftest = shared_library('reftest',
+libreftest = library('reftest',
   [ 'expand-expander.c',
     'frame-inhibitor.c',
     'letter-spacing.c',